Bump version #'s.

Maybe someday translations will work on Mac _and_ Windows at the same time.
Grrr.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4096 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in
index b29ea0a526c0e5732c1ad69cbef4424bacca1e1f..5aa2321df13454b5dff1c683c922216246181368 100644 (file)
--- a/gpsbabel/Makefile.in
+++ b/gpsbabel/Makefile.in
@@ -352,10 +352,11 @@ mac-gui: gpsbabel
        cd gui ; qmake && make
        cd gui ; lupdate  app.pro
        cd gui ; lrelease  app.pro
-       mkdir gui/objects/GPSBabelFE.app/Contents/MacOS/translations
+       [ ! -d gui/objects/GPSBabelFE.app/Contents/MacOS/translations ] && \
+         mkdir -p gui/objects/GPSBabelFE.app/Contents/MacOS/translations
        cp gui/*.qm  gui/objects/gpsbabelFE.app/Contents/MacOS/translations
        cp gpsbabel gui/objects/GPSBabelFE.app/Contents/MacOS
-       cp -r gui/help  gui/objects/GPSBabelFE.app/Contents/MacOS
+       cp -r gui/help/*.html  gui/objects/GPSBabelFE.app/Contents/MacOS
        cp gui/gmapbase.html gui/objects/GPSBabelFE.app/Contents/MacOS
        tools/mac-localize
 

diff --git a/gpsbabel/configure b/gpsbabel/configure
index e732bdf245d67c1f5ae57389cc6052f802275123..f0b3116ea22f0b29a56ce576de3c6423b86c4986 100755 (executable)
--- a/gpsbabel/configure
+++ b/gpsbabel/configure
@@ -1745,13 +1745,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 DOCVERSION=`echo $PACKAGE_VERSION`
 
 # 1.4.1 is a tiny tweak to 1.4.0.  Use that doc.
-DOCVERSION=1.4.2
+DOCVERSION=1.4.3
 
 
 # Increase GBBUILD for a new release
-GBBUILD=22
+GBBUILD=23
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
-# PACKAGE_RELEASE="-beta20100518"
+PACKAGE_RELEASE="-beta20111002"
 # DOCVERSION=development
 
 cat >>confdefs.h <<_ACEOF

diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in
index b10eb7c899096966825f51e5b5fa28d568bb4e9d..4a0f3c624dee938ed40b2377a9e129dd6afa8dff 100644 (file)
--- a/gpsbabel/configure.in
+++ b/gpsbabel/configure.in
@@ -7,13 +7,13 @@ AC_INIT(GPSBabel, 1.4.2, BUG-REPORT-ADDRESS)
 DOCVERSION=`echo $PACKAGE_VERSION`
 
 # 1.4.1 is a tiny tweak to 1.4.0.  Use that doc.
-DOCVERSION=1.4.2
+DOCVERSION=1.4.3
 
 
 # Increase GBBUILD for a new release
-GBBUILD=22
+GBBUILD=23
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
-# PACKAGE_RELEASE="-beta20100518"
+PACKAGE_RELEASE="-beta20111002"
 # DOCVERSION=development
 AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.])
 AC_SUBST(PACKAGE_RELEASE)

diff --git a/gpsbabel/gbversion.h b/gpsbabel/gbversion.h
index cd23a18e3895818e98dd5102bb208c82c5e023b5..a3b7bedfe365294912a139575aca2819acfb333e 100644 (file)
--- a/gpsbabel/gbversion.h
+++ b/gpsbabel/gbversion.h
@@ -4,5 +4,5 @@
  *
  * Isn't simplification via automation grand?
  */
-#define VERSION "1.4.2"
-#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.4.2"
+#define VERSION "1.4.2-beta20111002"
+#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.4.3"

diff --git a/gpsbabel/gui/app.pro b/gpsbabel/gui/app.pro
index a168a5c741083c9d7ca7164b47a2ac7dce829f7a..9fc5b95ae2eaa0aa02217e7176c3ff21daad2872 100755 (executable)
--- a/gpsbabel/gui/app.pro
+++ b/gpsbabel/gui/app.pro
@@ -6,7 +6,7 @@ CONFIG += qt release
 
 # For Mac, build Universal binary.   Ignored on other OSes.
 # QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-CONFIG += x86 ppc
+CONFIG -= x86 _64
 
 ICON = images/appicon.icns
 

diff --git a/gpsbabel/gui/gpsbabelfe.ts b/gpsbabel/gui/gpsbabelfe.ts
index 913515b81455e3e6d4a695e646af2ad51c94877b..5d6bb5cd62902671df813e0f211a8b773b8dc9e4 100644 (file)
--- a/gpsbabel/gui/gpsbabelfe.ts
+++ b/gpsbabel/gui/gpsbabelfe.ts
@@ -634,144 +634,144 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="mainwindow.cpp" line="379"/>
         <location filename="mainwindow.cpp" line="380"/>
-        <location filename="mainwindow.cpp" line="381"/>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="554"/>
+        <location filename="mainwindow.cpp" line="553"/>
         <source>Select one or more input files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="581"/>
+        <location filename="mainwindow.cpp" line="580"/>
         <source>Output File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="641"/>
+        <location filename="mainwindow.cpp" line="640"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="652"/>
+        <location filename="mainwindow.cpp" line="651"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="674"/>
+        <location filename="mainwindow.cpp" line="673"/>
         <source>Input and output formats do not support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="677"/>
+        <location filename="mainwindow.cpp" line="676"/>
         <source>Input does not support %1; output format supports %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="680"/>
+        <location filename="mainwindow.cpp" line="679"/>
         <source>Input format supports %1; output format does not support %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="683"/>
+        <location filename="mainwindow.cpp" line="682"/>
         <source>Both input and output formats support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="704"/>
+        <location filename="mainwindow.cpp" line="703"/>
         <source>waypoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="705"/>
+        <location filename="mainwindow.cpp" line="704"/>
         <source>tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="706"/>
+        <location filename="mainwindow.cpp" line="705"/>
         <source>routes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="795"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="803"/>
-        <location filename="mainwindow.cpp" line="823"/>
+        <location filename="mainwindow.cpp" line="802"/>
+        <location filename="mainwindow.cpp" line="822"/>
         <source>Options for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="816"/>
+        <location filename="mainwindow.cpp" line="815"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="837"/>
+        <location filename="mainwindow.cpp" line="836"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="856"/>
+        <location filename="mainwindow.cpp" line="855"/>
         <source>No input file specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="863"/>
+        <location filename="mainwindow.cpp" line="862"/>
         <source>No valid output specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="868"/>
+        <location filename="mainwindow.cpp" line="867"/>
         <source>No output file specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="884"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="898"/>
+        <location filename="mainwindow.cpp" line="897"/>
         <source>Process exited unsucessfully with code %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1041"/>
+        <location filename="mainwindow.cpp" line="1040"/>
         <source>Translation successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1051"/>
+        <location filename="mainwindow.cpp" line="1050"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1164"/>
+        <location filename="mainwindow.cpp" line="1163"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1188"/>
+        <location filename="mainwindow.cpp" line="1187"/>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1231"/>
+        <location filename="mainwindow.cpp" line="1230"/>
         <source>One or more data filters are active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1233"/>
+        <location filename="mainwindow.cpp" line="1232"/>
         <source>No data filters are active</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/gpsbabel/gui/gpsbabelfe_de.qm b/gpsbabel/gui/gpsbabelfe_de.qm
index b2a80d69557add7e573f8df1a7d1147705fcf27d..9e879819a6b376a50c34a14e5b4c826f20f2cd89 100644 (file)
Binary files a/gpsbabel/gui/gpsbabelfe_de.qm and b/gpsbabel/gui/gpsbabelfe_de.qm differ

diff --git a/gpsbabel/gui/gpsbabelfe_de.ts b/gpsbabel/gui/gpsbabelfe_de.ts
index 0b1e2d88c8709db4c84542b1f6b77a5f3c8ef82c..b1792c828f6d268372ac4bea3772096bf7f37135 100644 (file)
--- a/gpsbabel/gui/gpsbabelfe_de.ts
+++ b/gpsbabel/gui/gpsbabelfe_de.ts
@@ -454,23 +454,23 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MainWindow</name>
     <message>
+        <location filename="mainwindow.cpp" line="379"/>
         <location filename="mainwindow.cpp" line="380"/>
-        <location filename="mainwindow.cpp" line="381"/>
         <source>default</source>
         <translation>default</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="554"/>
+        <location filename="mainwindow.cpp" line="553"/>
         <source>Select one or more input files</source>
         <translation>eine oder mehrere Originaldateien markieren</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="581"/>
+        <location filename="mainwindow.cpp" line="580"/>
         <source>Output File Name</source>
         <translation>Zieldatei-Name</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="641"/>
+        <location filename="mainwindow.cpp" line="640"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -479,7 +479,7 @@ This program cannot continue.</source>
 Das Programm muss abgebrochen werden.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="652"/>
+        <location filename="mainwindow.cpp" line="651"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -488,114 +488,114 @@ This program cannot continue.</source>
 Das Prgramm muss abgebrochen werden.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="674"/>
+        <location filename="mainwindow.cpp" line="673"/>
         <source>Input and output formats do not support %1</source>
         <translation>Keine Unterstützung für %1 im Ein- oder Ausgabeformat</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="677"/>
+        <location filename="mainwindow.cpp" line="676"/>
         <source>Input does not support %1; output format supports %2</source>
         <translation>Keine Unterstützung für %1 im Eingabeformat; Ausgabeformat unterstützt %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="680"/>
+        <location filename="mainwindow.cpp" line="679"/>
         <source>Input format supports %1; output format does not support %2</source>
         <translation>Eingabeformat  unterstützt %1. Keine Unterstützung für %2 im Ausgabeformat</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="683"/>
+        <location filename="mainwindow.cpp" line="682"/>
         <source>Both input and output formats support %1</source>
         <translation>Ein- und Ausgabeformat unterstützen %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="704"/>
+        <location filename="mainwindow.cpp" line="703"/>
         <source>waypoints</source>
         <translation>Wegpunkte</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="705"/>
+        <location filename="mainwindow.cpp" line="704"/>
         <source>tracks</source>
         <translation>tracks</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="706"/>
+        <location filename="mainwindow.cpp" line="705"/>
         <source>routes</source>
         <translation>Routen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="795"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation>Es gibt keine Eingabeoptionen für das Format &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="803"/>
-        <location filename="mainwindow.cpp" line="823"/>
+        <location filename="mainwindow.cpp" line="802"/>
+        <location filename="mainwindow.cpp" line="822"/>
         <source>Options for %1</source>
         <translation>Optionen für %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="816"/>
+        <location filename="mainwindow.cpp" line="815"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation>Es gibt keine Ausgabeoptionen für das Format &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="837"/>
+        <location filename="mainwindow.cpp" line="836"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation>keine gültige Angabe von Wegpunkt-/Routen-/Trackfiltern</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="856"/>
+        <location filename="mainwindow.cpp" line="855"/>
         <source>No input file specified</source>
         <translation>keine Quelldatei angegeben</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="863"/>
+        <location filename="mainwindow.cpp" line="862"/>
         <source>No valid output specified</source>
         <translation>keine gültiges Ziel angegeben</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="868"/>
+        <location filename="mainwindow.cpp" line="867"/>
         <source>No output file specified</source>
         <translation>keine Zieldatei angegeben</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="884"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation>Prozess &quot;%1&quot; wurde nicht gestartet</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="898"/>
+        <location filename="mainwindow.cpp" line="897"/>
         <source>Process exited unsucessfully with code %1</source>
         <translation>Prozess endete mit code %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1041"/>
+        <location filename="mainwindow.cpp" line="1040"/>
         <source>Translation successful</source>
         <translation>Konvertierung erfolgreich</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1051"/>
+        <location filename="mainwindow.cpp" line="1050"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation>Fehler beim Aufruf von gpsbabel: %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1164"/>
+        <location filename="mainwindow.cpp" line="1163"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation>Sind Sie sicher, dass Sie alle Formatoptionen auf die Vorgaben stellen wollen?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1188"/>
+        <location filename="mainwindow.cpp" line="1187"/>
         <source>About %1</source>
         <translation>Über %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1231"/>
+        <location filename="mainwindow.cpp" line="1230"/>
         <source>One or more data filters are active</source>
         <translation>Einer oder mehrere Datenfilter sind aktiviert</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1233"/>
+        <location filename="mainwindow.cpp" line="1232"/>
         <source>No data filters are active</source>
         <translation>Keine Datenfilter sind aktiv</translation>
     </message>

diff --git a/gpsbabel/gui/gpsbabelfe_es.qm b/gpsbabel/gui/gpsbabelfe_es.qm
index 2a7e074274e00a729c5573ae3404a9a0a709c368..667f5fbb5f12d42c7514b406eafdb770f17e8b89 100644 (file)
Binary files a/gpsbabel/gui/gpsbabelfe_es.qm and b/gpsbabel/gui/gpsbabelfe_es.qm differ

diff --git a/gpsbabel/gui/gpsbabelfe_es.ts b/gpsbabel/gui/gpsbabelfe_es.ts
index 409f67c7b6c583fb2319a6bd563c2b91a953060d..32e95c852a828a4edafbff0aa98a74e8a296011a 100644 (file)
--- a/gpsbabel/gui/gpsbabelfe_es.ts
+++ b/gpsbabel/gui/gpsbabelfe_es.ts
@@ -505,144 +505,144 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MainWindow</name>
     <message>
+        <location filename="mainwindow.cpp" line="379"/>
         <location filename="mainwindow.cpp" line="380"/>
-        <location filename="mainwindow.cpp" line="381"/>
         <source>default</source>
         <translation>Defecto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="554"/>
+        <location filename="mainwindow.cpp" line="553"/>
         <source>Select one or more input files</source>
         <translation>Seleccionar uno o más archivos de entrada</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="581"/>
+        <location filename="mainwindow.cpp" line="580"/>
         <source>Output File Name</source>
         <translation>Nombre del fichero de salida</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="641"/>
+        <location filename="mainwindow.cpp" line="640"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation>Se ha producido un error cuando se intentaba leer la configuración. Compruebe que el núcleo de &quot;gpsbabel&quot; está instalado correctamente y que se halla en la RUTA actual. Este programa no puede continuar.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="652"/>
+        <location filename="mainwindow.cpp" line="651"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation>El formato de alfunos ficheros o dispositivos no se halló durante la inicialización. Compruebe que el núcleo de &quot;gpsbabel&quot; está instalado correctamente y que se halla en la RUTA actual. Este programa no puede continuar.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="674"/>
+        <location filename="mainwindow.cpp" line="673"/>
         <source>Input and output formats do not support %1</source>
         <translation>Formatos de entrada y salida inadmisibles %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="677"/>
+        <location filename="mainwindow.cpp" line="676"/>
         <source>Input does not support %1; output format supports %2</source>
         <translation>Formatos de entrada inadmisible %1; Formatos de salida inadmisible %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="680"/>
+        <location filename="mainwindow.cpp" line="679"/>
         <source>Input format supports %1; output format does not support %2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="683"/>
+        <location filename="mainwindow.cpp" line="682"/>
         <source>Both input and output formats support %1</source>
         <translation>Formatos de entrada y salida admisibles (ambos) %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="704"/>
+        <location filename="mainwindow.cpp" line="703"/>
         <source>waypoints</source>
         <translation>Puntos de interés</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="705"/>
+        <location filename="mainwindow.cpp" line="704"/>
         <source>tracks</source>
         <translation>Registro de trazados</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="706"/>
+        <location filename="mainwindow.cpp" line="705"/>
         <source>routes</source>
         <translation>Rutas</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="795"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation>No hay opciones de entrada para el formato &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="803"/>
-        <location filename="mainwindow.cpp" line="823"/>
+        <location filename="mainwindow.cpp" line="802"/>
+        <location filename="mainwindow.cpp" line="822"/>
         <source>Options for %1</source>
         <translation>Opciones de %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="816"/>
+        <location filename="mainwindow.cpp" line="815"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation>No hay opciones de salida para el formato &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="837"/>
+        <location filename="mainwindow.cpp" line="836"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation>Se han especificicado puntos de interés, trazados o rutas no traducibles</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="856"/>
+        <location filename="mainwindow.cpp" line="855"/>
         <source>No input file specified</source>
         <translation>No se ha especificado el fichero de entrada</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="863"/>
+        <location filename="mainwindow.cpp" line="862"/>
         <source>No valid output specified</source>
         <translation>El fichero de salida no es válido</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="868"/>
+        <location filename="mainwindow.cpp" line="867"/>
         <source>No output file specified</source>
         <translation>No se ha especificado el fichero de salida</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="884"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation>El proceso &quot;%1&quot; no comenzó</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="898"/>
+        <location filename="mainwindow.cpp" line="897"/>
         <source>Process exited unsucessfully with code %1</source>
         <translation>El proceso terminó sin suerte y con el código %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1041"/>
+        <location filename="mainwindow.cpp" line="1040"/>
         <source>Translation successful</source>
         <translation>Traducción realizada con éxito</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1051"/>
+        <location filename="mainwindow.cpp" line="1050"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation>Error ejecutando gpsbabel: %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1164"/>
+        <location filename="mainwindow.cpp" line="1163"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation>¿Estás seguro de que quieres volver a los formatos por defecto?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1188"/>
+        <location filename="mainwindow.cpp" line="1187"/>
         <source>About %1</source>
         <translation>Acerca de %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1231"/>
+        <location filename="mainwindow.cpp" line="1230"/>
         <source>One or more data filters are active</source>
         <translation>Uno o más filtros de datos están activos</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1233"/>
+        <location filename="mainwindow.cpp" line="1232"/>
         <source>No data filters are active</source>
         <translation>Ningún filtro de datos está activo</translation>
     </message>

diff --git a/gpsbabel/gui/gpsbabelfe_fr.ts b/gpsbabel/gui/gpsbabelfe_fr.ts
index a5bd8a5962927f5f86c2c079ec901fb0163e6c4a..2329e697e000025040b7a84f885f59d3b732ef13 100644 (file)
--- a/gpsbabel/gui/gpsbabelfe_fr.ts
+++ b/gpsbabel/gui/gpsbabelfe_fr.ts
@@ -444,144 +444,144 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MainWindow</name>
     <message>
+        <location filename="mainwindow.cpp" line="379"/>
         <location filename="mainwindow.cpp" line="380"/>
-        <location filename="mainwindow.cpp" line="381"/>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="554"/>
+        <location filename="mainwindow.cpp" line="553"/>
         <source>Select one or more input files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="581"/>
+        <location filename="mainwindow.cpp" line="580"/>
         <source>Output File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="641"/>
+        <location filename="mainwindow.cpp" line="640"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="652"/>
+        <location filename="mainwindow.cpp" line="651"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="674"/>
+        <location filename="mainwindow.cpp" line="673"/>
         <source>Input and output formats do not support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="677"/>
+        <location filename="mainwindow.cpp" line="676"/>
         <source>Input does not support %1; output format supports %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="680"/>
+        <location filename="mainwindow.cpp" line="679"/>
         <source>Input format supports %1; output format does not support %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="683"/>
+        <location filename="mainwindow.cpp" line="682"/>
         <source>Both input and output formats support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="704"/>
+        <location filename="mainwindow.cpp" line="703"/>
         <source>waypoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="705"/>
+        <location filename="mainwindow.cpp" line="704"/>
         <source>tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="706"/>
+        <location filename="mainwindow.cpp" line="705"/>
         <source>routes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="795"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="803"/>
-        <location filename="mainwindow.cpp" line="823"/>
+        <location filename="mainwindow.cpp" line="802"/>
+        <location filename="mainwindow.cpp" line="822"/>
         <source>Options for %1</source>
         <translation>Options pour %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="816"/>
+        <location filename="mainwindow.cpp" line="815"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="837"/>
+        <location filename="mainwindow.cpp" line="836"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="856"/>
+        <location filename="mainwindow.cpp" line="855"/>
         <source>No input file specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="863"/>
+        <location filename="mainwindow.cpp" line="862"/>
         <source>No valid output specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="868"/>
+        <location filename="mainwindow.cpp" line="867"/>
         <source>No output file specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="884"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="898"/>
+        <location filename="mainwindow.cpp" line="897"/>
         <source>Process exited unsucessfully with code %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1041"/>
+        <location filename="mainwindow.cpp" line="1040"/>
         <source>Translation successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1051"/>
+        <location filename="mainwindow.cpp" line="1050"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1164"/>
+        <location filename="mainwindow.cpp" line="1163"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1188"/>
+        <location filename="mainwindow.cpp" line="1187"/>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1231"/>
+        <location filename="mainwindow.cpp" line="1230"/>
         <source>One or more data filters are active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1233"/>
+        <location filename="mainwindow.cpp" line="1232"/>
         <source>No data filters are active</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/gpsbabel/gui/gpsbabelfe_hu.ts b/gpsbabel/gui/gpsbabelfe_hu.ts
index 2e4f1fc29533f97669cd26ce7615ea16a575cd9c..964edd307f395816fd65983ca1638f30065e47b6 100644 (file)
--- a/gpsbabel/gui/gpsbabelfe_hu.ts
+++ b/gpsbabel/gui/gpsbabelfe_hu.ts
@@ -444,144 +444,144 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MainWindow</name>
     <message>
+        <location filename="mainwindow.cpp" line="379"/>
         <location filename="mainwindow.cpp" line="380"/>
-        <location filename="mainwindow.cpp" line="381"/>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="554"/>
+        <location filename="mainwindow.cpp" line="553"/>
         <source>Select one or more input files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="581"/>
+        <location filename="mainwindow.cpp" line="580"/>
         <source>Output File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="641"/>
+        <location filename="mainwindow.cpp" line="640"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="652"/>
+        <location filename="mainwindow.cpp" line="651"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="674"/>
+        <location filename="mainwindow.cpp" line="673"/>
         <source>Input and output formats do not support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="677"/>
+        <location filename="mainwindow.cpp" line="676"/>
         <source>Input does not support %1; output format supports %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="680"/>
+        <location filename="mainwindow.cpp" line="679"/>
         <source>Input format supports %1; output format does not support %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="683"/>
+        <location filename="mainwindow.cpp" line="682"/>
         <source>Both input and output formats support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="704"/>
+        <location filename="mainwindow.cpp" line="703"/>
         <source>waypoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="705"/>
+        <location filename="mainwindow.cpp" line="704"/>
         <source>tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="706"/>
+        <location filename="mainwindow.cpp" line="705"/>
         <source>routes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="795"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="803"/>
-        <location filename="mainwindow.cpp" line="823"/>
+        <location filename="mainwindow.cpp" line="802"/>
+        <location filename="mainwindow.cpp" line="822"/>
         <source>Options for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="816"/>
+        <location filename="mainwindow.cpp" line="815"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="837"/>
+        <location filename="mainwindow.cpp" line="836"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="856"/>
+        <location filename="mainwindow.cpp" line="855"/>
         <source>No input file specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="863"/>
+        <location filename="mainwindow.cpp" line="862"/>
         <source>No valid output specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="868"/>
+        <location filename="mainwindow.cpp" line="867"/>
         <source>No output file specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="884"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="898"/>
+        <location filename="mainwindow.cpp" line="897"/>
         <source>Process exited unsucessfully with code %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1041"/>
+        <location filename="mainwindow.cpp" line="1040"/>
         <source>Translation successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1051"/>
+        <location filename="mainwindow.cpp" line="1050"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1164"/>
+        <location filename="mainwindow.cpp" line="1163"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1188"/>
+        <location filename="mainwindow.cpp" line="1187"/>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1231"/>
+        <location filename="mainwindow.cpp" line="1230"/>
         <source>One or more data filters are active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1233"/>
+        <location filename="mainwindow.cpp" line="1232"/>
         <source>No data filters are active</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/gpsbabel/gui/gpsbabelfe_it.qm b/gpsbabel/gui/gpsbabelfe_it.qm
index b8674f24697d6cf70db0cb78c3190e8f1d04a9ce..eb9befcc398a62fd1ba05a2d1a7e78c67edf7a4e 100644 (file)
Binary files a/gpsbabel/gui/gpsbabelfe_it.qm and b/gpsbabel/gui/gpsbabelfe_it.qm differ

diff --git a/gpsbabel/gui/gpsbabelfe_it.ts b/gpsbabel/gui/gpsbabelfe_it.ts
index 756954383e81253b4484bc4a2bc0bb5f1b931122..97219a9d579bf4ea1f4920449d6e222d113cba76 100644 (file)
--- a/gpsbabel/gui/gpsbabelfe_it.ts
+++ b/gpsbabel/gui/gpsbabelfe_it.ts
@@ -660,23 +660,23 @@ p, li { white-space: pre-wrap; }
         <translation></translation>
     </message>
     <message>
+        <location filename="mainwindow.cpp" line="379"/>
         <location filename="mainwindow.cpp" line="380"/>
-        <location filename="mainwindow.cpp" line="381"/>
         <source>default</source>
         <translation>predefinite</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="554"/>
+        <location filename="mainwindow.cpp" line="553"/>
         <source>Select one or more input files</source>
         <translation>Selezionare uno o più file in ingresso</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="581"/>
+        <location filename="mainwindow.cpp" line="580"/>
         <source>Output File Name</source>
         <translation>Nome del file in uscita</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="641"/>
+        <location filename="mainwindow.cpp" line="640"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -685,7 +685,7 @@ This program cannot continue.</source>
 Questo programma non può proseguire.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="652"/>
+        <location filename="mainwindow.cpp" line="651"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -694,115 +694,115 @@ This program cannot continue.</source>
 Questo programma non può proseguire.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="674"/>
+        <location filename="mainwindow.cpp" line="673"/>
         <source>Input and output formats do not support %1</source>
         <translation>I formati di ingresso e di uscita non supportano %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="677"/>
+        <location filename="mainwindow.cpp" line="676"/>
         <source>Input does not support %1; output format supports %2</source>
         <translation>L&apos;ingresso non supporta %1, il formato di destinazione supporta %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="680"/>
+        <location filename="mainwindow.cpp" line="679"/>
         <source>Input format supports %1; output format does not support %2</source>
         <translation>Il formato in ingresso supporta %1, il formato di destinazione non supporta %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="683"/>
+        <location filename="mainwindow.cpp" line="682"/>
         <source>Both input and output formats support %1</source>
         <translation>I formati di origine e di destinazione supportano %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="704"/>
+        <location filename="mainwindow.cpp" line="703"/>
         <source>waypoints</source>
         <translation>punti di interesse</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="705"/>
+        <location filename="mainwindow.cpp" line="704"/>
         <source>tracks</source>
         <translation>tracce</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="706"/>
+        <location filename="mainwindow.cpp" line="705"/>
         <source>routes</source>
         <translation>rotte</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="795"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation>Non ci sono opzioni in ingresso per il formato &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="803"/>
-        <location filename="mainwindow.cpp" line="823"/>
+        <location filename="mainwindow.cpp" line="802"/>
+        <location filename="mainwindow.cpp" line="822"/>
         <source>Options for %1</source>
         <translation>Opzioni per %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="816"/>
+        <location filename="mainwindow.cpp" line="815"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation>Non ci sono opzioni in uscita per il formato &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="837"/>
+        <location filename="mainwindow.cpp" line="836"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation>Non è stato specificato alcun punto di interesse/rotta/traccia</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="856"/>
+        <location filename="mainwindow.cpp" line="855"/>
         <source>No input file specified</source>
         <translation>Il file di origine non è stato specificato</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="863"/>
+        <location filename="mainwindow.cpp" line="862"/>
         <source>No valid output specified</source>
         <translation>Non è stata specificata una destinazione valida</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="868"/>
+        <location filename="mainwindow.cpp" line="867"/>
         <source>No output file specified</source>
         <translation>Il file di destinazione non è stato specificato</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="884"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation>Il processo &quot;%1&quot; non è stato avviato</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="898"/>
+        <location filename="mainwindow.cpp" line="897"/>
         <source>Process exited unsucessfully with code %1</source>
         <translation>Il processo è terminato con il codice di errorre %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1041"/>
+        <location filename="mainwindow.cpp" line="1040"/>
         <source>Translation successful</source>
         <translation>Traduzione terminata con successo</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1051"/>
+        <location filename="mainwindow.cpp" line="1050"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation>Errore durante l&apos;esecuzione di gpsbabel: %1
 </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1164"/>
+        <location filename="mainwindow.cpp" line="1163"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation>Si è certi di voler reimpostare tutte le opzioni dei formati ai valori predefiniti?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1188"/>
+        <location filename="mainwindow.cpp" line="1187"/>
         <source>About %1</source>
         <translation>Informazioni su %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1231"/>
+        <location filename="mainwindow.cpp" line="1230"/>
         <source>One or more data filters are active</source>
         <translation>È attivo uno o più filtri di dati</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1233"/>
+        <location filename="mainwindow.cpp" line="1232"/>
         <source>No data filters are active</source>
         <translation>Nessun filtro di dati è attivo</translation>
     </message>

diff --git a/gpsbabel/gui/gpsbabelfe_ru.qm b/gpsbabel/gui/gpsbabelfe_ru.qm
index 9b34020ff642752eec82a3908e4828f9aa373d76..19e8ad9600d04712663dd81db4c626044dd76878 100644 (file)
Binary files a/gpsbabel/gui/gpsbabelfe_ru.qm and b/gpsbabel/gui/gpsbabelfe_ru.qm differ

diff --git a/gpsbabel/gui/gpsbabelfe_ru.ts b/gpsbabel/gui/gpsbabelfe_ru.ts
index 371fce22dabfbbcd355b4e9d79e6f8b01ed72c30..faf01ade76af064b5e4a3e8db15303fe3b171f1c 100644 (file)
--- a/gpsbabel/gui/gpsbabelfe_ru.ts
+++ b/gpsbabel/gui/gpsbabelfe_ru.ts
@@ -658,23 +658,23 @@ p, li { white-space: pre-wrap; }
         <translation>Сделать пожертвование...</translation>
     </message>
     <message>
+        <location filename="mainwindow.cpp" line="379"/>
         <location filename="mainwindow.cpp" line="380"/>
-        <location filename="mainwindow.cpp" line="381"/>
         <source>default</source>
         <translation>по умолчанию</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="554"/>
+        <location filename="mainwindow.cpp" line="553"/>
         <source>Select one or more input files</source>
         <translation>Выберите один или несколько файлов</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="581"/>
+        <location filename="mainwindow.cpp" line="580"/>
         <source>Output File Name</source>
         <translation>Имя выходного файла</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="641"/>
+        <location filename="mainwindow.cpp" line="640"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -683,7 +683,7 @@ This program cannot continue.</source>
 Выполнение программы не может быть продолжено.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="652"/>
+        <location filename="mainwindow.cpp" line="651"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -692,114 +692,114 @@ This program cannot continue.</source>
 Выполнение программы не может быть продолжено.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="674"/>
+        <location filename="mainwindow.cpp" line="673"/>
         <source>Input and output formats do not support %1</source>
         <translation>Входной и выходной форматы не поддерживают %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="677"/>
+        <location filename="mainwindow.cpp" line="676"/>
         <source>Input does not support %1; output format supports %2</source>
         <translation>Входной формат не поддерживает %1; выходной формат поддерживает %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="680"/>
+        <location filename="mainwindow.cpp" line="679"/>
         <source>Input format supports %1; output format does not support %2</source>
         <translation>Входной формат поддерживает %1; выходной формат не поддерживаетt %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="683"/>
+        <location filename="mainwindow.cpp" line="682"/>
         <source>Both input and output formats support %1</source>
         <translation>Входной и выходной формат поддерживают %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="704"/>
+        <location filename="mainwindow.cpp" line="703"/>
         <source>waypoints</source>
         <translation>маршрутные точки</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="705"/>
+        <location filename="mainwindow.cpp" line="704"/>
         <source>tracks</source>
         <translation>треки</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="706"/>
+        <location filename="mainwindow.cpp" line="705"/>
         <source>routes</source>
         <translation>маршруты</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="795"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation>Нет входных параметров для формата &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="803"/>
-        <location filename="mainwindow.cpp" line="823"/>
+        <location filename="mainwindow.cpp" line="802"/>
+        <location filename="mainwindow.cpp" line="822"/>
         <source>Options for %1</source>
         <translation>Параметры %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="816"/>
+        <location filename="mainwindow.cpp" line="815"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation>Нет выходных параметров для формата &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="837"/>
+        <location filename="mainwindow.cpp" line="836"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation>Не выбрано преобразование маршрутных точек/маршрутов/треков</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="856"/>
+        <location filename="mainwindow.cpp" line="855"/>
         <source>No input file specified</source>
         <translation>Не выбран входной файл</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="863"/>
+        <location filename="mainwindow.cpp" line="862"/>
         <source>No valid output specified</source>
         <translation>Не выбран выходной файл</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="868"/>
+        <location filename="mainwindow.cpp" line="867"/>
         <source>No output file specified</source>
         <translation>Не выбран выходной файл</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="884"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation>Процесс &quot;%1&quot; не запустился</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="898"/>
+        <location filename="mainwindow.cpp" line="897"/>
         <source>Process exited unsucessfully with code %1</source>
         <translation>Процесс завершился неудачей с кодом %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1041"/>
+        <location filename="mainwindow.cpp" line="1040"/>
         <source>Translation successful</source>
         <translation>Конвертация выполнена</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1051"/>
+        <location filename="mainwindow.cpp" line="1050"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation>Ошибка запуска gpsbabel: %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1164"/>
+        <location filename="mainwindow.cpp" line="1163"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation>Вы действительно желаете сбросить все параметры формата в значения по умолчанию?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1188"/>
+        <location filename="mainwindow.cpp" line="1187"/>
         <source>About %1</source>
         <translation>О %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1231"/>
+        <location filename="mainwindow.cpp" line="1230"/>
         <source>One or more data filters are active</source>
         <translation>Один или более фильтров данных активны</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1233"/>
+        <location filename="mainwindow.cpp" line="1232"/>
         <source>No data filters are active</source>
         <translation>Фильтры данных не активны</translation>
     </message>

diff --git a/gpsbabel/gui/mainwinui.ui b/gpsbabel/gui/mainwinui.ui
index 897fbdbaa820f14417b3e217eee7780ac7a82ff8..0650d3b3913c359f60a9bc50a127c90568efc14b 100644 (file)
--- a/gpsbabel/gui/mainwinui.ui
+++ b/gpsbabel/gui/mainwinui.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>GPSBabel</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout_5">

diff --git a/gpsbabel/gui/setup.iss b/gpsbabel/gui/setup.iss
index 1f726edc917982fdb3b296d7a660361491364f5a..bca05e8eba6fd9c54b854262af0e2757a89a0bf5 100755 (executable)
--- a/gpsbabel/gui/setup.iss
+++ b/gpsbabel/gui/setup.iss
@@ -16,7 +16,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)\r
 AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017}\r
 AppName=GPSBabel\r
-AppVerName=GPSBabel 1.4.3-beta20110903\r
+AppVerName=GPSBabel 1.4.2-beta20111002\r
 AppPublisher=GPSBabel\r
 AppPublisherURL=http://www.gpsbabel.org\r
 AppSupportURL=http://www.gpsbabel.org\r
@@ -24,7 +24,7 @@ AppUpdatesURL=http://www.gpsbabel.org
 DefaultDirName={pf}\GPSBabel\r
 DefaultGroupName=GPSBabel\r
 OutputDir=release\r
-OutputBaseFilename=GPSBabel-1.4.3-beta20110903-Setup\r
+OutputBaseFilename=GPSBabel-1.4.2-beta20111002-Setup\r
 SetupIconFile=images\babel2.ico\r
 Compression=lzma\r
 SolidCompression=yes\r
@@ -39,7 +39,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 [Files]\r
 ; This isn't as wreckless as it seems; these directories are populated on a\r
 ; controlled way by the batch file.\r
-Source: qtdir\bin\*.dll;       DestDir: "{app}"; Flags: ignoreversion \r
+Source: qtdir\bin\*.dll;               DestDir: "{app}"; Flags: ignoreversion\r
 Source: qtdir\plugins\*;               DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs\r
 \r
 Source: gmapbase.html;                         DestDir: "{app}"; Flags: ignoreversion\r

diff --git a/gpsbabel/gui/setup.iss.in b/gpsbabel/gui/setup.iss.in
index 90c52cb587af12e88be61679f4ad18ab68548567..a5f9d6c372d8d44c1b424d1301f49f39b5b3a499 100755 (executable)
--- a/gpsbabel/gui/setup.iss.in
+++ b/gpsbabel/gui/setup.iss.in
@@ -37,12 +37,9 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked\r
 \r
 [Files]\r
-Source: qtdir\bin\QtCore4.dll;         DestDir: "{app}"; Flags: ignoreversion\r
-Source: qtdir\bin\QtGui4.dll;          DestDir: "{app}"; Flags: ignoreversion\r
-Source: qtdir\bin\QtWebkit4.dll;       DestDir: "{app}"; Flags: ignoreversion\r
-Source: qtdir\bin\QtXml4.dll;          DestDir: "{app}"; Flags: ignoreversion\r
-Source: qtdir\bin\QtNetwork4.dll;      DestDir: "{app}"; Flags: ignoreversion\r
-Source: qtdir\mingw\mingwm10.dll;      DestDir: "{app}"; Flags: ignoreversion \r
+; This isn't as wreckless as it seems; these directories are populated on a\r
+; controlled way by the batch file.\r
+Source: qtdir\bin\*.dll;               DestDir: "{app}"; Flags: ignoreversion\r
 Source: qtdir\plugins\*;               DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs\r
 \r
 Source: gmapbase.html;                         DestDir: "{app}"; Flags: ignoreversion\r
@@ -51,36 +48,22 @@ Source: qt.conf;                            DestDir: "{app}"; Flags: ignoreversion
 Source: release\gpsbabelfe.exe;        DestDir: "{app}"; Flags: ignoreversion\r
 Source: release\libexpat.dll;          DestDir: "{app}"; Flags: ignoreversion\r
 Source: release\gpsbabel.exe;          DestDir: "{app}"; Flags: ignoreversion\r
-Source: release\help\*;                DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs\r
+; Source: release\help\*;              DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs\r
 \r
 ; Translation strings extracted from source code.  Include it in the dist\r
 ; so that users can translate if they want to. \r
-Source: gpsbabel_de.ts;                DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabel_es.ts;                DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabel_fr.ts;                DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabel_hu.ts;                DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabel_it.ts;                DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe_de.ts;              DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe_es.ts;              DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe_fr.ts;              DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe_hu.ts;              DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe_it.ts;              DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe_ru.ts;              DestDir: "{app}\translations"; Flags: ignoreversion \r
+; Source: gpsbabel_*.ts;               DestDir: "{app}\translations"; Flags: ignoreversion \r
+; Source: gpsbabelfe_*.ts;             DestDir: "{app}\translations"; Flags: ignoreversion \r
 \r
 ; Compiled translation strings that are used at runtime.\r
-; Only Spanish is adequately translated for now.\r
-Source: gpsbabel_es.qm;                DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe_es.qm;              DestDir: "{app}\translations"; Flags: ignoreversion \r
-\r
-; German is usable\r
-Source: gpsbabel_de.qm;                DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe_de.qm;              DestDir: "{app}\translations"; Flags: ignoreversion \r
+; Source: gpsbabel_*.qm;               DestDir: "{app}\translations"; Flags: ignoreversion \r
+Source: gpsbabelfe*.qm;                DestDir: "{app}\translations"; Flags: ignoreversion \r
 \r
 ; Now translations from Qt's own UI stuff.\r
 Source: qtdir\translations\*;                  DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs\r
 \r
 ; Miscellaneous\r
-Source: COPYING;                       DestDir: {app}; Flags: ignoreversion\r
+Source: COPYING.txt;                   DestDir: {app}; Flags: ignoreversion\r
 ; Source: AUTHORS;                     DestDir: {app}; Flags: ignoreversion\r
 ; Source: README.contrib;                      DestDir: {app}; Flags: ignoreversion\r
 ; Source: README.gui;                  DestDir: {app}; Flags: ignoreversion\r

diff --git a/gpsbabel/tools/mac-config b/gpsbabel/tools/mac-config
index c986085f1df7b083b2c14cbdaa8825cc81763786..cba4191f850243531d241f4860840383f9f41734 100755 (executable)
--- a/gpsbabel/tools/mac-config
+++ b/gpsbabel/tools/mac-config
@@ -5,8 +5,8 @@ case `uname -r` in
   *)   XFLAGS="-mmacosx-version-min=10.4" ;; # 10.5/Leopard
 esac 
 SRC=.
-CFLAGS="$XFLAGS  -O  -arch i386 -arch ppc" \
-  LDFLAGS="$XFLAGS -arch i386 -arch ppc"   ${SRC}/configure \
+CFLAGS="$XFLAGS  -O  -arch i386 " \
+  LDFLAGS="$XFLAGS -arch i386 "   ${SRC}/configure \
  --with-libexpat=${SRC}/mac/lib/libexpat.a \
  --with-expathdr=${SRC}/mac/include
 

diff --git a/gpsbabel/tools/mac-localize b/gpsbabel/tools/mac-localize
index c23ac568b26a19b1cfb5464c41e2a0850a0d40f5..660dbc202194039f04055908b9bbfe1afad57553 100755 (executable)
--- a/gpsbabel/tools/mac-localize
+++ b/gpsbabel/tools/mac-localize
@@ -2,8 +2,8 @@
 # the application menu and system buttons.  See description at
 # http://doc.qt.nokia.com/4.6/mac-differences.html#translating-the-application-menu-and-native-dialogs
 
-QTDIR=/Developer/Applications/Qt/translations/
-LANGDIR=objects/GPSBabelFE.app/Contents/MacOS/lang
+QTDIR="/Developer/Applications/Qt/Qt Creator.app/Contents/Resources/translations"
+LANGDIR=objects/GPSBabelFE.app/Contents/MacOS/translations
 
 
 mkplist() {
@@ -11,7 +11,8 @@ mkplist() {
   [ ! -d $D ] && mkdir $D
   sed "s/LANGUAGE/$1/" ../tools/skeleton-locversion-plist > $D/locversion.plist
   # optional as en, it, and hu aren't translated in Qt yet.
-  [ -f $QTDIR/qt_$1.qm ] && cp $QTDIR/qt_$1.qm $LANGDIR
+  [ ! -f "$QTDIR/qt_$1.qm" ]  && echo "Bad QTDIR"
+  cp "$QTDIR/qt_$1.qm" $LANGDIR
   [ -f gpsbabelfe_${1}.qm ] && cp gpsbabelfe_${1}.qm  $LANGDIR
 }
 

diff --git a/gpsbabel/tools/mkchanges b/gpsbabel/tools/mkchanges
index 12db347d5d0ff5abb0c611b6e174fcc135d4e178..13c056ffd45954a4dacfd504a79e09fed4ad7add 100644 (file)
--- a/gpsbabel/tools/mkchanges
+++ b/gpsbabel/tools/mkchanges
@@ -1,4 +1,29 @@
 # cvsps -u
+
+svn log | awk '
+skip = 0;
+/^r[0-9].*lines?$/ {
+  if (count > 0) printf "  </td>\n</tr>\n"
+  printf "<tr>\n  <td class=\"date\">%s</td>\n  <td>", $5
+  count++;
+  next
+}
+/^----.*----$/ {
+  if (skip == 1 ) printf "</td>\n</tr>\n"
+  next
+}
+/^$/ {
+  next
+}
+{
+  skip = 1;
+  print $0; 
+  next
+}
+' 
+
+exit 0
+
 cvsps $* |  awk '
 /^Date:/ { 
        logt = "";

diff --git a/gpsbabel/tools/mkdmg b/gpsbabel/tools/mkdmg
index 9a2f61ec816cee1ccf27afcec179ffea83f207ed..aa63b904cdb4c3b06d28103b66398fd55a590b0f 100755 (executable)
--- a/gpsbabel/tools/mkdmg
+++ b/gpsbabel/tools/mkdmg
@@ -8,10 +8,10 @@ QUIET=-quiet
 
 
 checkgpsbabel() {
-  file $1 | grep -q "2 architectures" || {
-    echo $1 is not a universal binary.  Aborting
-    exit 1
-  }
+#  file $1 | grep -q "2 architectures" || {
+#    echo $1 is not a universal binary.  Aborting
+#    exit 1
+#  }
   otool -L $1 | grep expat && {
     echo $1 does not staticly link expat.  Use tools/mac-config
     exit 1

diff --git a/gpsbabel/xcsv.c b/gpsbabel/xcsv.c
index 5fc11b073ad41ab5784afd3861a1668a4693d2bd..46e524d66499f14bb38bdb97521d89a661569514 100644 (file)
--- a/gpsbabel/xcsv.c
+++ b/gpsbabel/xcsv.c
@@ -602,8 +602,10 @@ xcsv_wr_init(const char *fname)
 {
   /* if we don't have an internal style defined, we need to
    * read it from a user-supplied style file, or die trying.
+   * 8/19 - add test for styleopt to ensure that a write of a style
+   * after a read of a style works.
    */
-  if (xcsv_file.is_internal) {
+  if (xcsv_file.is_internal && !styleopt) {
     xcsv_read_internal_style(intstylebuf);
   } else {